From 57f1362319f2af96f2681a2d3e8164b9cac18b95 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Wed, 10 Nov 2010 14:15:23 +0000 Subject: [PATCH] hvmloader: Fix 22383:cba667fb80cf iterating over defns 0..255 We need to declare devfn as wider than 8 bits for a loop 0 --- tools/firmware/hvmloader/hvmloader.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/firmware/hvmloader/hvmloader.c b/tools/firmware/hvmloader/hvmloader.c index 893d5dc5a3..5ba71f6217 100644 --- a/tools/firmware/hvmloader/hvmloader.c +++ b/tools/firmware/hvmloader/hvmloader.c @@ -470,8 +470,7 @@ static int scan_option_rom( */ static int scan_etherboot_nic(uint32_t copy_rom_dest) { - uint8_t devfn; - uint16_t class, vendor_id, device_id; + uint16_t class, vendor_id, device_id, devfn; int rom_size = 0; for ( devfn = 0; (devfn < 256) && !rom_size; devfn++ ) @@ -498,8 +497,7 @@ static int scan_etherboot_nic(uint32_t copy_rom_dest) static int pci_load_option_roms(uint32_t rom_base_addr) { uint32_t option_rom_addr, rom_phys_addr = rom_base_addr; - uint16_t vendor_id, device_id; - uint8_t devfn, class; + uint16_t vendor_id, device_id, devfn, class; for ( devfn = 0; devfn < 256; devfn++ ) { -- 2.30.2